Make the default network-script to be '' i.e. don't run a network script. Fix Makefil...

Signed-off-by: ian@xensource.com

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 54ad20fd94eac6ef403404125aa8a9ebe7a3b4c3..c0b7fffc958bc00e9fb4bf4d5c107f356504fb7e 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -16,7 +16,7 @@ XEN_CONFIGS += xmexample.vmx
 
 # Xen script dir and scripts to go there.
 XEN_SCRIPT_DIR = /etc/xen/scripts
-XEN_SCRIPTS = network vif-bridge
+XEN_SCRIPTS = network-bridge vif-bridge
 XEN_SCRIPTS += network-route vif-route
 XEN_SCRIPTS += block-file
 XEN_SCRIPTS += block-enbd

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index b12b0268b785fe8f0ea48165263d0ec186a06900..279dd146222fe7f3340111030842305a4de96ce4 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -315,7 +315,7 @@ class XendRoot:
         return self.get_config_value('block-%s' % type, '')
 
     def get_network_script(self):
-        return self.get_config_value('network-script', 'network')
+        return self.get_config_value('network-script', '')
 
     def get_enable_dump(self):
         return self.get_config_bool('enable-dump', 'no')